From dc66fe31f3bd4a63d95be94a0e6144ce102ea460 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 17 Oct 2005 15:54:28 +0100 Subject: [PATCH] Remove useless SIF_XXX_BE_DOMAIN driver flags. Signed-off-by: Keir Fraser --- .../drivers/xen/blkback/blkback.c | 4 -- .../drivers/xen/blkfront/blkfront.c | 14 +------ .../drivers/xen/blktap/blktap.c | 6 +-- .../drivers/xen/netback/netback.c | 6 --- .../drivers/xen/tpmback/tpmback.c | 5 --- .../include/asm-xen/asm-i386/hypervisor.h | 2 + .../include/asm-xen/asm-ia64/hypervisor.h | 1 + tools/python/xen/xend/XendDomainInfo.py | 40 ++++--------------- xen/arch/ia64/xen/domain.c | 2 +- xen/include/public/xen.h | 6 --- 10 files changed, 13 insertions(+), 73 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index c769342255..c9d812695e 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -494,10 +494,6 @@ static int __init blkif_init(void) int i; struct page *page; - if (!(xen_start_info->flags & SIF_INITDOMAIN) && - !(xen_start_info->flags & SIF_BLK_BE_DOMAIN)) - return 0; - blkif_interface_init(); page = balloon_alloc_empty_page_range(MMAP_PAGES); diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c index edb5360cd7..671f16038c 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -725,21 +725,9 @@ static struct xenbus_driver blkfront = { .suspend = blkfront_suspend, }; -static void __init init_blk_xenbus(void) -{ - xenbus_register_driver(&blkfront); -} - static int __init xlblk_init(void) { - if ((xen_start_info->flags & SIF_INITDOMAIN) || - (xen_start_info->flags & SIF_BLK_BE_DOMAIN) ) - return 0; - - IPRINTK("Initialising virtual block device driver\n"); - - init_blk_xenbus(); - + xenbus_register_driver(&blkfront); return 0; } diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c index 748dcdd2c0..dacedfc227 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c @@ -861,11 +861,7 @@ static int __init blkif_init(void) { int i, j, err; struct page *page; -/* - if ( !(xen_start_info->flags & SIF_INITDOMAIN) && - !(xen_start_info->flags & SIF_BLK_BE_DOMAIN) ) - return 0; -*/ + blkif_interface_init(); page = balloon_alloc_empty_page_range(MMAP_PAGES); diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c index 1c29a97f9d..656ed94ded 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c @@ -781,12 +781,6 @@ static int __init netback_init(void) int i; struct page *page; - if (!(xen_start_info->flags & SIF_NET_BE_DOMAIN) && - !(xen_start_info->flags & SIF_INITDOMAIN)) - return 0; - - IPRINTK("Initialising Xen netif backend.\n"); - /* We can increase reservation by this much in net_rx_action(). */ balloon_update_driver_allowance(NETIF_RX_RING_SIZE); diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c index 0a8d70528c..9b02556e56 100644 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c @@ -1076,11 +1076,6 @@ static int __init tpmback_init(void) { int rc; - if (!(xen_start_info->flags & SIF_TPM_BE_DOMAIN) && - !(xen_start_info->flags & SIF_INITDOMAIN)) { - printk(KERN_ALERT "Neither TPM-BE Domain nor INIT domain!\n"); - return 0; - } if ((rc = misc_register(&ibmvtpms_miscdevice)) != 0) { printk(KERN_ALERT "Could not register misc device for TPM BE.\n"); diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h index 55c8761913..06015e6ccb 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypervisor.h @@ -50,6 +50,8 @@ # endif #endif +extern shared_info_t *HYPERVISOR_shared_info; + /* arch/xen/i386/kernel/setup.c */ extern start_info_t *xen_start_info; diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h index 6890c67d7d..da4303f9b6 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h @@ -39,6 +39,7 @@ #include #include +extern shared_info_t *HYPERVISOR_shared_info; extern start_info_t *xen_start_info; void force_evtchn_callback(void); diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 3615aed8d9..2c92da390e 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -81,19 +81,8 @@ restart_modes = [ STATE_DOM_OK = 1 STATE_DOM_SHUTDOWN = 2 -"""Flag for a block device backend domain.""" -SIF_BLK_BE_DOMAIN = (1<<4) - -"""Flag for a net device backend domain.""" -SIF_NET_BE_DOMAIN = (1<<5) - -"""Flag for a TPM device backend domain.""" -SIF_TPM_BE_DOMAIN = (1<<7) - - SHUTDOWN_TIMEOUT = 30 - DOMROOT = '/local/domain/' VMROOT = '/vm/' @@ -512,11 +501,6 @@ class XendDomainInfo: if self.info['maxmem_KiB'] > self.info['memory_KiB']: self.info['maxmem_KiB'] = self.info['memory_KiB'] - # Validate the given backend names. - for s in self.info['backend']: - if s not in backendFlags: - raise VmError('Invalid backend type: %s' % s) - for (n, c) in self.info['device']: if not n or not c or n not in controllerClasses: raise VmError('invalid device (%s, %s)' % @@ -678,8 +662,7 @@ class XendDomainInfo: def getBackendFlags(self): - return reduce(lambda x, y: x | backendFlags[y], - self.info['backend'], 0) + return 0 def refreshShutdown(self, xeninfo = None): @@ -1409,25 +1392,16 @@ class XendDomainInfo: implements the device control specific to that device-class.""" controllerClasses = {} - -"""A map of backend names and the corresponding flag.""" -backendFlags = {} - - -def addControllerClass(device_class, backend_name, backend_flag, cls): +def addControllerClass(device_class, backend_name, cls): """Register a subclass of DevController to handle the named device-class. - - @param backend_flag One of the SIF_XYZ_BE_DOMAIN constants, or None if - no flag is to be set. """ cls.deviceClass = device_class - backendFlags[backend_name] = backend_flag controllerClasses[device_class] = cls from xen.xend.server import blkif, netif, tpmif, pciif, usbif -addControllerClass('vbd', 'blkif', SIF_BLK_BE_DOMAIN, blkif.BlkifController) -addControllerClass('vif', 'netif', SIF_NET_BE_DOMAIN, netif.NetifController) -addControllerClass('vtpm', 'tpmif', SIF_TPM_BE_DOMAIN, tpmif.TPMifController) -addControllerClass('pci', 'pciif', None, pciif.PciController) -addControllerClass('usb', 'usbif', None, usbif.UsbifController) +addControllerClass('vbd', 'blkif', blkif.BlkifController) +addControllerClass('vif', 'netif', netif.NetifController) +addControllerClass('vtpm', 'tpmif', tpmif.TPMifController) +addControllerClass('pci', 'pciif', pciif.PciController) +addControllerClass('usb', 'usbif', usbif.UsbifController) diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 64eda8638b..e77d1d1498 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -351,7 +351,7 @@ void new_thread(struct vcpu *v, } VCPU(v, banknum) = 1; VCPU(v, metaphysical_mode) = 1; - d->shared_info->arch.flags = (d == dom0) ? (SIF_INITDOMAIN|SIF_PRIVILEGED|SIF_BLK_BE_DOMAIN|SIF_NET_BE_DOMAIN|SIF_USB_BE_DOMAIN) : 0; + d->shared_info->arch.flags = (d == dom0) ? (SIF_INITDOMAIN|SIF_PRIVILEGED) : 0; } } diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 3c2d0094f2..c88113ab6c 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -430,12 +430,6 @@ typedef struct start_info { /* These flags are passed in the 'flags' field of start_info_t. */ #define SIF_PRIVILEGED (1<<0) /* Is the domain privileged? */ #define SIF_INITDOMAIN (1<<1) /* Is this the initial control domain? */ -#define SIF_BLK_BE_DOMAIN (1<<4) /* Is this a block backend domain? */ -#define SIF_NET_BE_DOMAIN (1<<5) /* Is this a net backend domain? */ -#define SIF_USB_BE_DOMAIN (1<<6) /* Is this a usb backend domain? */ -#define SIF_TPM_BE_DOMAIN (1<<7) /* Is this a TPM backend domain? */ -/* For use in guest OSes. */ -extern shared_info_t *HYPERVISOR_shared_info; typedef uint64_t cpumap_t; -- 2.30.2